Feature/36+37

Fixes issues #36 & #37