Final cleanup of merge conflict

still v.0.1.21
Issue #26