Fix Issue #54
Fix Issue #55
Fix Issue #55
Fix Issue #56
Merge branch 'master' into idcf