merging previous commit to master branch
Merge branch 'mic'
Merge branch 'master' of https://github.com/rbellido/fuzzy-hipster