fix error
Merge branch 'master' of github.com:slon/shad-bigdata