commit
Merge pull request #926 from DonLakeFlyer/BufferOverun

Fix crash caused by buffer overrun