Merge pull request #121 from breathbath/master