Merge pull request #6 from pakozm/devel

Devel