Fixes

resolves issues #15 , #16 and #18