Merge pull request #7 from OckhamsRazor/jane

functions