Feature/beta5changes

Fixes for #34 and #36