Bugfixed
Merge pull request #3 from quest/dev

Bugfixed