resolves #93
resolves #96
resolves #96
Merge remote-tracking branch 'origin/beta2' into beta2
resolves #94
resolves #90
version bump and changelog
resolves #100
resolves #99
resolves #98
resolves #101
changelog