Fix #7
Fix #9
Merge branch 'master' into emn