some null fixs
Merge branch 'master' of github.com:iammain/OE_SW
 asdf
Merge branch 'master' of github.com:iammain/OE_SW
asdf
Merge branch 'master' of github.com:iammain/OE_SW
asdf
Merge branch 'master' of github.com:iammain/OE_SW