pushed the changes added by kopischke
first attempt at merging changes submitted by kopischke