here's some new stuff
Merge pull request #1 from gilestur/master

here's some new stuff