Did changes, fixes #2