Fixed #8 and #9