Merging pull request from tunnelshade manually due to git kung-fu FAIL :). Thanks tunnelshade