Optional second parameter
Merge branch 'mindsnacks-dev' of github.com:mindsnacks/moai-dev into mindsnacks-dev