Fixes Ticket #1 . Also fixes BlockType crash.

Signed-off-by: William Lebel <lebelwilliam@gmail.com>
Merge pull request #4 from greatman/master

Fixes Ticket #1 . Also fixes BlockType crash.