Waiting on cursor and then done
Merge branch 'master' of https://github.com/Polytonic/Feather