Merge remote-tracking branch 'origin/master' into dev
Merge remote-tracking branch 'origin/master' into dev
Updated comments
Merge pull request #23 from JRogaishio/dev

Dev