Fixes

Solves issue #6 and #5