Merge branch '_s_bootstrap' of github.com:avalla/_s into _s_bootstrap

Signed-off-by: giuliano <giuliano@insanely.us>
Merge branch '_s_bootstrap' of github.com:avalla/_s into _s_bootstrap