Beta 1.0
Merge origin/master