fixed bugs
Merge branch 'stable1.0' of github.com:geneshuman/epimorphism into stable1.0
fixed bugs