Merge pull request #2 from PRAAC/master

master copy to develop
Merge pull request #3 from PRAAC/develop

Merge pull request #2 from PRAAC/master