Some enhancements

[waja]

I started to make some changes to the code to make it more comfortable for me, maybe you can reuse it.

[KenMercusLai]

Thanks for the great pull, and I really appreciate it.

Can you squash the commits to be more concise?

[waja]

You want me to make that one big commit? My strategy is to make them small as you maybe want skip some of them (as I did, cause not generic enough).

[KenMercusLai]

All you have made are awesome. I cannot find any commit to skip. ^_^

I'm recently try to refactoring it, your commits help this a lot.

On Apr 13, 2015, at 13:20, waja notifications@github.com wrote:

You want me to make that one big commit? My strategy is to make them small as you maybe want skip some of them (as I did, cause not generic enough).

—
Reply to this email directly or view it on GitHub.

[KenMercusLai]

@waja I checked the pull request this morning and found yours lie here because of the conflicts.
I am poor at git cmds, and I accidentally merged your changes into the codes through my last commit.

Is this OK for you because these great work belongs to you and somehow I stolen it?
or please tell me how to revert it and correct way to solve conflict and merge pull request.

Ken