Fixed some issues in 0.11-series.
Merge pull request #1 from kkoopa/bugfix

Fixed some issues in 0.11-series.