Solved issue #4, #5.