Hannes Kuchelmeister
add missing changes from original repository
a58327a