Merge pull request #8 from HerrSubset/devel

Devel
Merge branch 'devel'