Changes made by Martin Jespersen (mjatzbox@gmail.com).