Update from http://glasklarthd.dreamnet.at - Closes #672, #669, #662, #646, #635