Fix bugs
Merge pull request #2 from contexthub/bugfixes

Fix bugs