Fixing #12 and #13