re tweaks from Kristoffer
Merge pull request #43 from yiendos/latest_changes

re tweaks from Kristoffer