Solved issue #6 and #7.