20131003 - Fix function prototype warnings, add setup folder
Merge pull request #1 from jihlein/master

20131003 - Fix function prototype warnings, add setup folder
Merge remote-tracking branch 'upstream/master'