Merge pull request #27 from csamuelson/master