bugfixes due to merge
Merge pull request #23 from claydotio/bugfixes

bugfixes due to merge