Resolve issue with merging of develop (#172)