Fixed build problem
Fixing build problems
Merge pull request #11 from rosemwahlin/master

Fixed build problems