fixes
Merge pull request #8 from vilmal/b-dev-ce

fixes