Bug

Error if master is not active
Merge branch 'master' of gh:JohnCEarls/MasterDirac
manual revert