#2 Merge latest master with branch 'topical' + simple cleaning of semicolons etc.