Fixes #54
Merge branch 'master' of https://github.com/fishnetsecurity/Lair