resolves #48
Fixes #49
Fixes #48
Fixes #51
Merge branch 'bugFix' to master