Merge pull request #14 from dochang/next

Bugfixes