Fixing build
Merge pull request #377 from dshurt/master

Fixing build