Fixes

Fixed #93