Fixed bug in release 1.0
Release 1.0 to be merged with develop