first changes from work laptop
Merge pull request #1 from cynosureofhyd2/worklaptop

first changes from work laptop