Bug fixes
Merge pull request #100 from uCtrl/bugFixes

Bug fixes