Fixing some issues after merging.
Merge pull request #40 from drobbs/master

Fixing some issues after merging.