Merge pull request #31 from adeven/development

Fix bugs introduced in recent refactorings