Fix 'undefined reference' errors.
Merge pull request #1 from chrahunt/master

Fix 'undefined reference' errors.