v0.2.2: corrected merging conflict (note to self: pull before you push from a different machine moron)