Closed #12
Merge.