First pull request. Want to bring somethingshort up-to-date with Master.

So that I can work in somethingshort and merge with Master periodically.