Commiting before merging 'with-marinos' branch onto master