removed Modules dependency, fixes #2