Fixing build
Merge pull request #34 from alxdarksage/develop

Fixing build