change ifndef guards, move split() to header file
Merge remote-tracking branch 'origin/master'