Updated version of the module.
Final version, i think.. :)