Merge branch 'master' into jessie
Merge branch 'master' into jessie
Added ion cannon tests.  Fixed some problems with the Ion cannon.
Merge branch 'working' into jessie
Merge pull request #55 from kalinka64/jessie

Added Ion Cannon tests.