Make manhole more secure
Merge pull request #211 from DesertBus/feature/manhole

Make manhole more secure