updates to functions
updates to functions
Merge pull request #9 from wgallios/dev

Dev