* fix merge issue
Merge pull request #12 from coryb/master

fix merge issue