Friday checking 1
Stashed changes committed
Merging Friday branch to master