some bugs fixed
Merge branch 'refactoring'
apk added