Fix conflicting parameter types
Fix linker warning
Merge pull request #5 from nlogax/master

Fix two warnings