Fix issue #41
Merge branch 'master' of github.com:ba4b/ba4b-siteback