fix for nulls
Merge branch 'master' of https://github.com/rysiekblah/EPAMHackathon2014