switched to markers
Merge branch 'master' of github.com:ottosipe/kaffee