Dev

Please pull in all the great changes I have done in the 'dev' branch.