Merge pull request #72 from pointoforder/devel