more minor fixes - Issue #25 Related
Resolve Merge