Merge pull request #1 from marghidanu/master

Cosmetic changes and added more dependencies
Added functionality
Merge remote-tracking branch 'upstream/master'
Updated from upstream and added some TODOs