change modules order
fix error on empty behaviors
Merge pull request #68 from just-boris/features

Fix erorrs