Many thanks for your contribution!I will merge it as soon as I get some time in front of the computer.
Bug fixes pushed :)
Thanks!
