tmp commit
merge
Changed name of the module to something less ridiculous
merged back changesets made in master