Fixing #8 and #9