Fixed #1 and #13