Issue #3: First commit :D
Issue #3: Fixed merge conflicts.