refs #2
refs #2, #3
Merge branch 'master' of https://github.com/baldurdae/dunkel