Merge pull request #56 from roscoe81/master