very sloppy, but i think its done
Merge pull request #10 from atran046/master

very sloppy, but i think its done