Little bit of sprucing up
Merge origin/master