bahablabhlah
Merge branch 'master' of https://github.com/lawrencelm/SmartBox
update for manu integration