dan style.
Merge branch 'develop' of github.com:bangpound/kal3a into develop