more work on design
Merge branch 'master' of https://github.com/edulun/BaLuGa