Updated some documentation
Added a template for the package documentation
Merge remote-tracking branch 'upstream/master'
Updated from upstream and added some TODOs
Merge pull request #2 from marghidanu/master

Added some TODOs