up and running
Merge pull request #1 from mateimgani/master

pull one