updates
Merge pull request #1 from phlco/newbranch

updates