Updated towards version 1.0
Merge origin/master