More fixing of merge? issues
Merge pull request #18 from sonelliot/fixes

More fixing of merge? issues