Beta version

* Update with final changes