Version 1.01 - fixed a couple null pointer issues.