Updated to rydurham's version 1.4.2