merge with my branch

still works the same way as before, the README contains a link to the
usage instructions