Created another conflict for Issue 53.
Resolving to merge Issue 54 with master.