minor fixes
Merge pull request #51 from vicb/20140314-minorFixes

minor fixes