Merge pull request #21 from OckhamsRazor/janelai

ahhh
hehehe