Hipster feature completed
Merge pull request #4 from gortazar/feature1

Hipster feature completed