Merge pull request #3 from seancoyne/master

fix some bad merges  (thanks @seancoyne)