Fixed several bugs making this module not to properly work
Merged develop into master