new stuff
Merge pull request #1 from alexmuro/master

new stuff