fixed base_maker
Merge branch 'develop' of https://github.com/mindpin/eshare into develop