Merge pull request #38 from shidel-dev/master

not sure what's going on, must learn github better