custom strtok_r implementation
Merge branch 'master' into exe