Merged beta version from bitbucket