merge
Merge pull request #4 from OckhamsRazor/janelai

merge