Merge pull request #70 from pakozm/devel

Devel
Merge pull request #71 from pakozm/devel

Devel