Merge pull request #24 from otlet/develop--koozil

Develop  koozil