Fixed: issue #48 (thanks to speedplane)