Merge pull request #2 from doughazell/2-1-stable

2 1 stable
Merge branch 'master' of https://github.com/doughazell/spreeBSC into 2-1-stable