Sorry, had some problems with figuring out submitting my changes to the project. I hope now it should be really ready to merge.