pakozm Merge pull request #21 from pakozm/devel