Tidying code
Merge pull request #8 from wvoelcker/master

Tidying