removed bug causing crash.
end of day commit
Merge remote-tracking branch 'origin/master'