stephen-soltesz Merge pull request #26 from yan0s/master