Major changes, baby. Major changes

Signed-off-by: Pär Karlsson <par.karlsson@ymail.com>
Merge branch 'master' of https://github.com/par-karlsson/SBWrapper