some merge
Merge branch 'master' of https://github.com/rodrigovitachi/ByteFly2014