Merge pull request #57 from anidev/master

Changes I made
Ports fixed, somewhat