Merge pull request #2 from stfalcon-studio/master

Update
Merge pull request #3 from stfalcon-studio/master

update
#18 remove unsed code
Merge pull request #29 from vatseek/fixes18

Fixes18