Merge pull request #23 from ritcheyer/master