null checking
Merge branch 'master' of github.com:ultrano/project_sw into sparky