Merged upstream/master
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
changed isnan to grt_isnan, nick please double check it ;)
Merge pull request #11 from openiSOFT/master

changed (forgot to change) isnan to grt_isnan