Merge pull request #138 from dejan-brkic/master

Code Cleanup