Fixed compile errors.
Merge pull request #113 from hojustin/master

Fixed compile errors.