Merge pull request #227 from alxdarksage/develop

Fixing build
Fixing build again