Merge with master. Fix #19.