Making everything tidy after so many pull requests
Merge pull request #97 from kreczko/cleaning

Making everything tidy after so many pull requests