spring cleaning
Merge branch 'master' of github.com:flr/FLa4a