magda's changes, fuck github.. sometimes
Merge pull request #26 from notandrewkaye/develop

magda's changes, fuck github.. sometimes