Revert "Revert "Merge branch 'master' of github.com:joschabach/micropsi2""

This reverts commit 7bc9df1e65cd49a59875e7dbe2e5133b156c7223.
fix missed renaming from 78043632
merge from upstream