Merge proposed new master

Updated the Angular branch with the proposed new master in #10