Merge pull request #14 from SchwarzwaldFalke/master

Master
Merge branch 'experimental'