misc
Merge branch 'develop' of https://github.com/t4410/ez into develop