Merge pull request #91 from RyanGlScott/master