Merge pull request #1 from jmazzare/master

pull latest files
Part 2
Merge pull request #64 from RoshaniL/master

Part 2