I really upgraded your program :P. 

I see that this cannot be automatically merger, because I fork your repo before the last commit. If you revert it everything should merge automatically.