Fixes #76
Merge branch 'master' into features/responsive_layout

# By Harold Angenent
# Via Harold Angenent
* master:
  Fixes #76