Fix: Issue #16 https://github.com/dkunzler/esperandro/issues/16