Merge pull request #20 from Rim-k/issue-2

Issues #2, #4 and #12
Ok but just fot this time ><