Merge pull request #58 from anidev/master

More changes I made