fix for issues 34 and 35
Merge pull request #37 from edx/bug-fixes

fix for issues 34 and 35