Merge branch 'master' of github.com:nickchappell/veewee