Merge pull request #23 from JustinRosenstein/master