Alpha merge

Merging current master into alpha-3