Cleaning up.
Merge pull request #5 from Glchriste/master

Cleaning up.