Implimented issues #21 and #22 couple other changes - refer to CHANGELOG.md