upgrade to 2014-03-18 offical version
Merge branch 'master' of https://github.com/sg552/sweet