Fixed bad commit - Reverted and merged with Github master. Should all be up to date now.