Bugfixes and improved responsiveness
Merge pull request #61 from pajcho/development

Bugfixes and improved responsiveness