fgfdsgfd
fixed
Merge pull request #33 from ly29/master

Stupid mistake
Merge pull request #26 from nortikin/master

sync