Fixing merge
Merge pull request #87 from alxdarksage/develop

Fixing merge