Merge pull request #137 from dejan-brkic/master

Cleanup