Remove comments
Merge remote-tracking branch 'upstream/master'
Merge pull request #16 from tanraya/master

Merged with upstream