fixes
fixes
fixes
update
fixes
Merge pull request #265 from microweber/develop

Merge some fixes