Merge pull request #7 from sebastianriese/master

Further merge fixes and improved option handling