Fixes compile issues accross 32/64bit targets
Merge pull request #3 from nevstad/master

Fixes compile issues accross 32/64bit targets