Lrwp2

two more commits from #5 which were lost because you merged too early. i tried to tell you to pull them, but you didn't hear me :(