Merge pull request #27 from jamesmkur/master