new version
Merge pull request #1 from rstirling/master

new version