Merge branch 'kentreis' into issue_34 ... get tests passing plus version bump