some optimizations & fixes
Merge branch 'master' of https://github.com/ukolshurika/simpson-membrane