Added documentation, created ToDo tags.
Merge remote-tracking branch 'origin/master'