Merge pull request #3 from Neob91/BUG_947

Unittests
Merge pull request #4 from Neob91/BUG_948

Bug 948
buildout