Stable v 1.0
Stable v 1.0
Merge origin/master