Merged the alpha branch with the master branch