Merging master from j0hnsmith

Thanks!