Remove old style function prototypes from data.h.
Merge remote-tracking branch 'upstream/master'
Merge pull request #4 from 1500100900/master

More fixes.