almost done
Merge pull request #20 from maiahariton/master

almost done