Fixed github #14, #12
Merge pull request #15 from omnipotentuser/hallway

Fixed github #14, #12