Update to forked master

Contains useful additions and fixes. Would be great to get the fork updated.