Fixed minor bug
Merge tag 'v0.0.18-dev'