Merge pull request #5 from pakozm/devel

Devel