bare basics
Merge branch 'master' of github.com:montchr/dante