Possible fix for non-object thing
Merge branch 'master' of https://github.com/Falkirks/TeamShog