Fix some problems
Merge branch 'master' of https://github.com/zerokes/sdc2013-wigle