develpment commit, not runable yet
Merge branch 'master' of https://github.com/stevenblaster/craplib