Final commit. I shall release the new version after this :)