Merge pull request #17 from regneq/CleanUps

Merge pull request #16 from regneq/master