fix build.sh, remove function pointers
Merge branch 'next'
slight touches to wireless
Merge pull request #16 from Jgke/master

Fix build.sh, remove function pointers