Issue #28 and other bug
Merge