Bug from Gerhard Fixed
Bug Fix: updates, added fixed bug in tests
Merge pull request #494 from adipopescu/BugGerhard

Bug gerhard