bugfix
Merge branch 'master' of github.com:skcho/zooberry
rename