Tumin changes #133

Open
duke wants to merge 5 commits from dan_s/SilentDragon:tumin into dev