Beta build

Merging beta with master