resolves #96
Merge remote-tracking branch 'origin/beta2' into beta2