Merge pull request #2 from mrstocks/master

Updating
Clean up
Merge pull request #28 from najela/master

Updating