Merge pull request #4 from wizcabbit/release

Release
[cabbit.me]Modify merge error with release