conig Merge pull request #2 from conig/devel