Addressed Binstub complaints.
Merge pull request #8 from DarryQueen/zhao_bugFixes

Addressed Binstub complaints.