some fixes
Merge pull request #7 from evernote/master

some fixes