Beta

Updating master to latest 'working' code