with non-enum props fix
Merge branch 'master' of github.com:brownplt/LambdaS5