Merge pull request #126 from mbeall/master

Steel 1.1.7
Merge pull request #11 from starverte/master

Merge pull request #126 from mbeall/master