Merge pull request #36 from drobbs/master

Added and Cleaned