First Version
Merge branch 'master' of github.com:psy2013GitHub/Atom