nchevobbe Merge pull request #9 from nchevobbe/1.5.0-fix