Add in fix from Cameron Spear (#10)