Comments and fix drawing
Merge pull request #1 from naarcini/master

Comments and aminations fix