Fork of https://github.com/petervyvey/membrane repo