Fix issues introduced by a botched merge
Merge pull request #115 from konektaz/up_develop

Fix issues introduced by a botched merge