cleaned up the code
Merge pull request #4 from fio4ri/master

cleaned up the code