final revision
Merge branch 'master' of https://github.com/a2design-company/hipster