perun 2017-10-14

@branch14 if you can put that code in a place I can see it, I'd be happy to take a look