Update with Debian 7.3.0, issue #17
Clean up code