Merge pull request #1 from wgallios/dev

dev of functions