Merging fixes from a fork by Daniel D'Abate (Thank you!), plus some minor style changes
Code style improvements (imho)
Bumping the version number