move from sp labs
Merge branch 'master' of github.com:mckoss/my-machine