Merge with pull request from krakjoe