removed smart comments
Merge branch 'devel'
v0.012