fixes #61 as per usual - will take up to 10 minutes to be live on the site
Merge branch 'master' into feature-9
some cosmetics