Combining changes in the 0.1.3 gem and the 0.1.4