issue #82 done
Merge branch 'develop' of https://github.com/ajency/EUC into issue#82