Merge pull request #17 from csamuelson/master