Merge pull request #156 from avelino/master

fix order by home