feature #101
Merge branch 'develop' of https://github.com/ajency/EUC into develop