Returning to master

Am happy with the experimental branch and want to merge it to master.