proton 2017-02-07

@beetlefeet thanks for the update 🙂

will try to merge asap