added self checking statements
Merge branch 'master' of https://github.com/RyanRedhead/CE2