Completing beta functionalities
Completing beta functionalities
Merge branch 'master' into gh-pages