multiple changes that never got pushed
Merge github.com:xNifty/MasterOfThieves