new release candidate
closes #39
Merge pull request #50 from ridoo/master

merge fixes