Fixes #34
Merge branch 'master' of git://github.com/sirjuddington/SLADE