added safe gaurd
Merge branch 'master' of https://github.com/elextro/myapp