fix nil values
Merge branch 'master' of github.com:alexshook/beat_tadashis_team