Merge pull request #28 from mechaet/master

TODO list revisited.
Merge pull request #6 from sandalle/master

Syncing with the mothership