this fixes #5 and updates #1