One stepforward two steps back
Merge pull request #1 from nhck/master

One stepforward two steps back