fixes and closes #24
Merge branch 'develop' of https://github.com/dirkschumacher/iUPB into develop