Stock And Branch fixes
Merge pull request #401 from sandal-smuggler/Branch-fix-1.01

Stock And Branch fixes