Merge pull request #1 from nag-uf/master

Plz merge master with branch-2 (pull request test)