Fixing build errors
Merge pull request #12 from rosemwahlin/master

Fixing build errors