Merge pull request #3 from kenpusney/leo's

Leo's merge.
Merge pull request #4 from kenpusney/leo's

Leo's update
Merge pull request #7 from td-cuit/leo's

Leo's