Fixes
Merge pull request #2 from christran/develop

Fixes