Fixed #12 and #13