Update API
Merge branch 'master' of https://github.com/rodxavier/devcup2013
Merge branch 'master' of https://github.com/rodxavier/devcup2013