Removed TODOs
Merge pull request #17 from bartekgruszka/dev-todos

Getting rid of TODOs