Merge pull request #10 from wgallios/dev

more dev of functions