Merge pull request #69 from drobbs/master

Cleaned and Fixed