Improved makefile
Builds without warning and improved makefile
Added chiniu's bugfix
Removed useless define
Merge pull request #1 from ComputerNerd/master

Builds without any warnings and better makefile