closes #47
closes #48
Merge branch 'develop' into feature/removeasync
build