Merged this pull-req into master now! Go ahead! :-)