Merge pull request #367 from unl-creq/master

major name change