Merge pull request #47 from rhokbrisbane/cleaning_code

Cleaning code
Merge branch 'master' into feature_specs