Merge branch 'master' of https://github.com/fiery-skippers-2014/EPICSWAP into fixing_bugs
Merge branch 'master' of https://github.com/fiery-skippers-2014/EPICSWAP into fixing_bugs
fixing three failing tests
Merge branch 'master' of https://github.com/fiery-skippers-2014/EPICSWAP into fixing_bugs

merging
Merge pull request #93 from fiery-skippers-2014/fixing_bugs

Fixing bugs