sync for push to orions laptop
Merge branch '1.0' of https://github.com/krisnye/ion into 1.0