Bug fixes
Merge remote-tracking branch 'drklo/dev'