wrongly merge commit?
Merge pull request #14 from timxx/dev

wrongly merge commit?