Merge Request #13 Conflicts resolved