Fixed #2
Merge.