Refactor
Merge branch 'master' of https://github.com/tapquo/atoms-app

* 'master' of https://github.com/tapquo/atoms-app:
  bug fixed