Merge pull request #83 from pakozm/devel

Devel, dangerous pull