cleaned code
Merge pull request #2 from Iddah/master

cleaned code