proton 2016-07-11

@thheller: thank you 🙂

@dvcrn @tgg thought about some things, there are many ways to break the current implementation. will need to change some things, not sure how yet though.