Squashed Commit that transforms master to beta

See branch beta-dev for actual commits