Merge pull request #25 from jnosky/master