refactoring
further refactoring on 'astro.js'
Merge branch 'develop'