Merge pull request #76 from korczis/devel

Devel
Consistent