Merge pull request #5 from Po1o/master

Bunch of fixes + cosmetic changes
Merge pull request #6 from Po1o/master

Add TODO file
Merge branch 'upstream'
Merge remote-tracking branch 'upstream/master'