Merge pull request #17 from pakozm/devel

Devel