Added toggle switch in menu [axof: 218]
merging latest with addComment branch att 1
Merge pull request #34 from deeger/addComment

Added Comment button and Fixed Toggle  [axof: 218]