Fixes #140 and #142

merged in develop as it was ahead

Edit - rebased