Merge pull request #10 from OckhamsRazor/janelai

hahi
ma