This makes things easier.

Just making things better. Sorry, i forked it only for this purpose