Merge pull request #1 from coolcsn/master

Please, merge my changes to the upstream. Yes I am merging.