From Søren Vinther Hansen <info@thenavigator.dk>

Updates for 1.1.1 by Kristian Nielsen <kristian@skjaldesang.dk>