Fixing #11 and #12