Added new merge type
Improved README. Closes #20
Preparing for version 0.6