Merge pull request #359 from seuros/alpha

Best in place 3.0.0.alpha
Sti fix