Fix uncovered buffer overruns.
Merge pull request #2 from lioncash/master

Fix uncovered buffer overruns.