Update with Debian 7.3.0, issue #17
Clean up code
Merge pull request #1 from dotzero/master

Update