todos and coments
Merge pull request #82 from HoltMaki/master

todos and coments