Merge pull request #20 from RonPasquarelli/master

Merged Don's changes