finally the final version
Merge branch 'master' of github.com:faebser/makerfare