Merging with changes made on github.
Merge branch 'master' of https://github.com/maciuszek/source
Some TODO was implemented