changed local (4)
Merge branch 'master' of https://github.com/leichus/leichus-summer-2014