telotortium Merge pull request #154 from cashweaver/master