Added safety check mechanism (needs some work)
Simple safety check
Merge pull request #30 from Callum-/master

safety check