Merge branch 'develop' of https://github.com/web-candy/velobox into develop