First round of merge
Merge branch 'nice' of github.com:sutt0n/spe into nice