Minor enhancement in comment removal (less empty lines)
Version bump
Merge branch 'release/0.1.6' into dev