Solved issue #3, #4 and #5.