Some conflict changes
Merge branch 'issue-4'