Sooo many changes.
Merge branch 'master' of github.com:clearhythm/SpinXSW