Fixing issue74 merge conflicts