Cleaning up inital commit
Merge pull request #3 from ozjd/master

Cleaned up initial commit