Tuesday's work
Merge pull request #6 from maxwellv/safety2

Tuesday's work