elia stuff
Merge pull request #1 from artofelia/eliaBranch

elia stuff accepted