support args on get_object_or_404
merge master with feature branch