Fix linux compile/link issues
minor updates
Merge pull request #2 from kmammou/master

Fix linux compile/link issues