updates for {B,D}
Merge branch 'master' of github.com:jwaldmann/s

Conflicts:
	Main.hs