Merged the alpha branch with the master branch

Merged the alpha branch with the master branch, because the alpha branch is "currently" out of alpha status.