Merging beta build into Master Branch

It's time to merge the current beta build into the master branch. It's tested and working stable.