Work on #5 fork and fix #608