bugfixes of #205 and #204
updates
update
Merge pull request #206 from microweber/dev

some fixes