Merge pull request #98 from fiery-skippers-2014/refactor

Refactor
Merge branch 'master' of https://github.com/fiery-skippers-2014/EPICSWAP into refactor
got rid of those silly hearts