Fix comment handling.
Merge branch 'master' of github:pione/pione into dev