stdcall mess
merge resolved
Merge pull request #2 from josh04/master

merge conflicts