Altered Makefile to avoid needing to chase changes
Repairing debian packaging
Merge pull request #275 from fuzzgun/master

Altered Makefile to avoid needing to chase changes
Better fix for issue #183

The former patch was too local; this one integrates better with the structure of the code.
Merge pull request #281 from pgimeno/cpu100percentfix

Better fix for issue #183
manual merge