Merge pull request #44 from pakozm/devel

Devel merge with Master