Initial core commit
Merge branch 'master' of github.com:marcelomx/Phasmine