NaN issue fix
Merge pull request #7 from mkanev/develop

NaN issue fix