Updated master branch from alpha branch