updates
small fixes
Merge pull request #211 from microweber/dev

small fixes