Fixes for #66 and #89
Merge branch 'fixes' into Events