Fixes #1 Fixes (partially) #5
rebased onto 966a5028eac1bcce2df03420f8fb5934f3da6583
Pull-Request has been merged by lcts
order to accomodate above changes.
Fixes #1
Fixes (partially) #5