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

fixes