A few small fixes
Merge pull request #88 from daviddavis/temp/20141105122001

A few small fixes