some small refactorings
include fix
Merge branch 'Master' of github.com:polybassa/Wifly_Light into Master