Merge pull request #26 from jchambers-ln/master

merging joe and drea's code