Merge pull request #136 from dejan-brkic/master

Cleanup