Fixed all errors and couple of warnings
Update Makefile
Merge pull request #12 from subterran3an/master

Fixed all errors and couple of warnings