Merge PR #99
Merge branch 'funkyfuture-auto-reload'